From 6afcd45024ef02798a4dcc078396a50f61636ddb Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 12 Apr 2006 21:22:42 +0000 Subject: [PATCH] Reorganize to avoid a possible NULL dereference. (Coverity) 2006-04-12 Matthias Clasen * gtk/gtknotebook.c (gtk_notebook_page_allocate): Reorganize to avoid a possible NULL dereference. (Coverity) --- ChangeLog | 3 +++ ChangeLog.pre-2-10 | 3 +++ gtk/gtknotebook.c | 19 ++++++++++--------- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 82b35ca611..b6bb7f0a12 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2006-04-12 Matthias Clasen + * gtk/gtknotebook.c (gtk_notebook_page_allocate): Reorganize + to avoid a possible NULL dereference. (Coverity) + * gdk/x11/gdkimage-x11.c (gdk_image_new_bitmap): Handle closed displays correctly. (Coverity) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 82b35ca611..b6bb7f0a12 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,8 @@ 2006-04-12 Matthias Clasen + * gtk/gtknotebook.c (gtk_notebook_page_allocate): Reorganize + to avoid a possible NULL dereference. (Coverity) + * gdk/x11/gdkimage-x11.c (gdk_image_new_bitmap): Handle closed displays correctly. (Coverity) diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c index c08db07bca..e7121d6342 100644 --- a/gtk/gtknotebook.c +++ b/gtk/gtknotebook.c @@ -5134,16 +5134,9 @@ gtk_notebook_page_allocate (GtkNotebook *notebook, gint tab_curvature; gint tab_pos = get_effective_tab_pos (notebook); - gtk_widget_style_get (widget, - "focus-line-width", &focus_width, - "tab-curvature", &tab_curvature, - NULL); - xthickness = widget->style->xthickness; ythickness = widget->style->ythickness; - gtk_widget_get_child_requisition (page->tab_label, &tab_requisition); - if (notebook->cur_page != page) { switch (tab_pos) @@ -5161,6 +5154,15 @@ gtk_notebook_page_allocate (GtkNotebook *notebook, } } + if (!page->tab_label) + return; + + gtk_widget_get_child_requisition (page->tab_label, &tab_requisition); + gtk_widget_style_get (widget, + "focus-line-width", &focus_width, + "tab-curvature", &tab_curvature, + NULL); + switch (tab_pos) { case GTK_POS_TOP: @@ -5212,8 +5214,7 @@ gtk_notebook_page_allocate (GtkNotebook *notebook, break; } - if (page->tab_label) - gtk_widget_size_allocate (page->tab_label, &child_allocation); + gtk_widget_size_allocate (page->tab_label, &child_allocation); } static void -- 2.30.2